Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 5 Feb 2010 15:06:31 +0000 (15:06 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 5 Feb 2010 15:06:31 +0000 (15:06 +0000)

Trivial merge